#25 and #17