Finally working correctly.