The last fix of 7th issue. For now.