#15 quick and dirty fix to this issue. Further works needed really