fixes #25 - got rid of lazy loading issue