Fixed bug #1594, #1565, #1598 - all of which were concerning the improper execution...