Issue #74: Reverted Drawing routine because of a display bug