merge
possible fix for TypeError