Attempt to fix #9 & #13