Times fix - fixes #27

This should be merged into master as well. I'll do a separate PR for it.