Switch other of time to current_time as the mix causes some weird time issues on some setups.

This will fix #55 also