temporary bugfixes / bashing disabled due to moral -.-