Fixed issue with keyword args