fixed #7 the quick n dirty way