Removed big bug...