bc wip
fixed 5.3 compatibility