Bemdecl merge fix