moar bugfix X-(