Quickfix of issue 134 (untested)