Hot fix for 1387