Possible fix to luke's black magic?