Refix #18, don't touch overriding methods

... an entire evening just for that :(