Bug Fix #4.2