Bug Fix attempt 2