Bug Fix #11