Bug H12. Temp solution