Correcting this bug a bit more...