Issue/205 time check