more compatibility issues

Added workaround for 2014b