Blacklight 5.4 compatibility