Workaround bugfix