check bugs #262, #261