#304 - committing what might be the fix for this particular issue