Make it work with WP 4 and BP 2