fixes for mantis bugs 15235 and 15236