BC-2009 this should fix it