additional fix for 2516