Deadline time bug: Fixes #328