Github issue workaround