Fixed hannes bug