Fix beforedrop problem due to upgrade to Architect3.1