Fix for #15 related to meteor/meteor#2255