Bug Fix #38