Bug Fix #6