Fix for BISERVER-8553