bugfix for tehloki problem