Hacky fix (hopefully)