Issue #1 - fix ruh roh