Fix for issue #1587

Was there more that needed to be done for #1587? If so, what... because I didn't see anything else.