Fix #13

Fix #13