Same patch as before now with better description added as requested by Roman.