Fix patch, closes #494