Maybe fix for issues #511 and #522 (eye adaption related - please check).