Quck and dirty bugfix