Issue #96 modified / Last Update Bug fix