Quick fix - till code improves