Removed commented out bug