Fixes #52 not in live version though