fixing fix-12484