Added another bugfix