Another attempt at a Bug Fix