back to working correctly