Fixed bug that was introduced in rc4