hacky fix for hacky implementation