Merge anowell's fix