bug fixes for 2854f78