Reverted Fix to #19

The fix to issue #19 did not work so I went back to the old way…