Fixes issue 7

Quick fix which works for me