Merge blaresteep's fix