Fix #7: not that smooth but working at least.