Fix #277

@suvayu this fixes #277