hurm... fixes