[HELP]: Incoming Zap call picked up when making outgoing zap

We are having a very small issue (happens once or twice a day) when a outside caller calls in at the very same moment that the Zap channel is grabbed by an outgoing call. Is there any way to prevent that from happening? Maybe reversing the channel use order for incoming and outgoing?

We have 6 zap channels on a TDM24xxp card (8 FXO ports). Asterisk doesn’t even log that channel is ringing when it is picked up. Perhaps there is a way to detect the ringing sooner?

Thanks for your time,