Tidied up now bug raised with Amazon:

https://forums.aws.amazon.com/thread.jspa?messageID=455100&#455100