Possible time bug; fix for bones corner cases