Fix #16

Fix #16