Fixed strange bug with timescale - look out for more