quick and dirty bugfix