Fix #449

Fix #449