Fixed #657 properly