Fixes bug introduced by resolution of #1