fix/hack to play nicely with org-mode

...with two additional garbage-commits, which could be safely removed if it's possible