Feels hacky but solves the issue