Fix #14

Fix #14