hacky fix, but let's see if it works