Fixed bloody bug