Fix fix time intervals

Fix for my partial fix #70