Beta4 - Workaround for #1.