Fix issues #11, #15