Correcting very ugly bug...