Bug fix #156, #182, #287, #325