Internal actions now working correctly