fixing 24h bug again
merge, fix conflicts