Make Second Bug Fix for new Feature