Fixes #50, lag issue