Fixing small Working Period bug