Bug Fix #7