fixes bugs introduced by 2db0127