Fix/fix

Fixing the shit in #753.

Work in progress.