Bug Fix #16