Fix #584

Continuation of #656