Fix for #154

Failing test and fix (including further simplification) for #154. The test may be suited to a more general location, as it's not necessarily specific to mixed plans.