Fix #6
Revert "Fix #6"

This reverts commit 94803b7d0db180b51c1cbd2c3237380345a5e6fa.
Fix #7
Revert "Revert "Fix #6""

This reverts commit ffdc0555c8a4fc75e917f30cb70670b1d7f83767.
Revert "Fix #7"

This reverts commit f421167cd166fc3d835c3cbfbe18b76916c4cd09.
Fix #6; Fix #7