Fixes #24: same fix as for #23