remvoed bug causing issues