Implement workaround to fix #2