Fix for APMToolbar connect button to work