Fixes #276, #277, #278