Fix for #15

Fix #15