another ugly fix