Fix for issue25