Fixed MInor Bug