#510 test fix