Fix for Assembly decision
Fix for Assembly event