Fixes broken code introduced in #126. This is we should not merge massive sweeping pull requests.