Temporary fixed issue #490

Simple "fix" for #490 until the real fix can be made in annotation package in 4.2.