attempt 2 for issue #40