#68 - addressing strange behaviour caused by Yosemite support implementation