Added workaround/solution for #5