Non-continuous mode (fixes #77)