Hacky Workaround