Step 1 of issue 23 fix