BUGFIX change workaround source