fix by bas' concerns