Bug #359, #361