Bug Fix (more to come)