Fixed bug with edited at checking