Bug Fix #24