fixes #254 - already working great