Temporary fix for Mirror problem, fixes #223