Simple fix for POST commands, remember to look at later to cleanup