Added ugly hack with strings