Bug Fix #4.1