re-worked for 12.11 compatibility