fixing stevo's issue