fix part one #56
Fix B - for issue #56
fixed another part of issue #56 but something is still wrong