Fixed #6

#11 can't be fixed due to epoch logic I believe, I'll keep a look out
though,