hacky fix for things