[New] Fix for #11