Justin's workaround