More tweaks in attempt to fix issue #2