two ugly worarounds to stay in schedule