bug fixes
MERGED