bugfix put to static