Issues #208, #209, #210, #211