That reminds me I should delete 10.5-specific code. It's no longer supported.