Fixed Issue 6, workaround for now