BISERVER-10378 - Passing correct constructor arguments