Incorporate my fix and miili's #2806 change