Fix to #11