Ensure listener order is maintained
resolves #686