workaround for #17, what d'ya think @minad