Bug Fix #519