Merge "Fix bug #502"